Fix calls to destroyDevice that are missing a force flag.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/server/DevController.py b/tools/python/xen/xend/server/DevController.py
index aa96e323cea59c58918a9850e95d54d29e32bb0d..6ac788503610eede572ceae34312aebecb7d77b0 100644 (file)
--- a/tools/python/xen/xend/server/DevController.py
+++ b/tools/python/xen/xend/server/DevController.py
@@ -155,13 +155,13 @@ class DevController:
         status = self.waitForBackend(devid)
 
         if status == Timeout:
-            self.destroyDevice(devid)
+            self.destroyDevice(devid, False)
             raise VmError("Device %s (%s) could not be connected. "
                           "Hotplug scripts not working." %
                           (devid, self.deviceClass))
 
         elif status == Error:
-            self.destroyDevice(devid)
+            self.destroyDevice(devid, False)
             raise VmError("Device %s (%s) could not be connected. "
                           "Backend device not found." %
                           (devid, self.deviceClass))
@@ -180,7 +180,7 @@ class DevController:
             if not err:
                 err = "Busy."
                 
-            self.destroyDevice(devid)
+            self.destroyDevice(devid, False)
             raise VmError("Device %s (%s) could not be connected.\n%s" %
                           (devid, self.deviceClass, err))